Fix gtkmisc padding calculation

Actually sum css padding and gtkmisc padding as intended in the previous
patch.

diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index d7b49eeefff9a8421a28fb4eba9d45da476fc58f..52749323abc16b04b1f16291a9799f94ac810be1 100644 (file)
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -425,9 +425,10 @@ _gtk_misc_get_padding_and_border (GtkMisc   *misc,
   gtk_style_context_get_padding (context, state, border);
 
   gtk_misc_get_padding (misc, &xpad, &ypad);
-
-  border->right = border->left = xpad;
-  border->top = border->bottom = xpad;
+  border->top += ypad;
+  border->left += xpad;
+  border->bottom += ypad;
+  border->right += xpad;
 
   gtk_style_context_get_border (context, state, &tmp);
   border->top += tmp.top;